291e088685e89078f98419b2ef736aff8b33b440,portal-impl/src/com/liferay/portlet/journal/action/EditArticleAction.java,EditArticleAction,updateArticle,#ActionRequest#,405

Before Change


			else {
				if (curArticle.isTemplateDriven()) {
					JournalStructure structure =
						JournalStructureLocalServiceUtil.getStructure(
							groupId, structureId);

					content = JournalUtil.mergeArticleContent(
						curArticle.getContent(), content);

After Change


				if (curArticle.isTemplateDriven()) {
					JournalStructure structure = null;

					try {
						structure =
							JournalStructureLocalServiceUtil.getStructure(
								groupId, structureId);
					}
					catch (NoSuchStructureException nsse) {
						structure =
							JournalStructureLocalServiceUtil.getStructure(
								themeDisplay.getCompanyGroupId(), structureId);
					}

					content = JournalUtil.mergeArticleContent(